bitkeeper revision 1.1519.1.1 (42926ccbNcRLyOP3D-TWC04yWeeZkA)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

diff --cc .hgtags
index 379b789e6ae904e1e2b71c33a57916969d07c3ae,49eeffb7721b35790fb81573fad9955369ed1eb2..0df167c413bdfef21d1a8fbbbde77bd158f0c657
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -1,12 -1,9 +1,12 @@@
  42882b3e0dda89f3a8ec00da568f86e9b3c230f1 RELEASE-2.0.0
  475a162b66e2c19b1e9468b234a4ba705334905e RELEASE-2.0.1
 -82ba8bd1ceb2e03af769775fb8bc890dcab04f72 RELEASE-2.0.3
 +dc2f08429f17e6614fd2f1ab88cc09ca0a850f32 RELEASE-2.0.2
 +6e1bbc13911751efa0b1c018425c1b085820fa02 RELEASE-2.0.3
 +fb875591fd72e15c31879c0e9034d99b80225595 RELEASE-2.0.4
  1a522944f76540ea9d73fcc1b0d13d0f670183f0 RELEASE-2.0.5
- 543ffea3fc12a8e7dce6e7e4ece21eee8e7ac4c6 RELEASE-2.0.6
+ 2a5814ad2e5634a5fa291b703a152e7fc0b4faf0 RELEASE-2.0.6
  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
 +1f84d0497a5901b9f8d1a051b87871d140b7e23f ia64-stable
  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
  30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable
  9afec5bc14aeb197ef37ea54a57eacd427463fc3 semistable

diff --cc buildconfigs/mk.linux-2.4-xen0
Simple merge

diff --cc buildconfigs/mk.linux-2.4-xenU
Simple merge

diff --cc buildconfigs/mk.linux-2.6-xen0
index 4a123641a83991145168ecdc183d7191d27c50a1,f273d4970171f8bbbca3e3a86ae44abbaf7233f7..1034cccf4c44f7f2f7831bea25be9fc9972e18b6
--- 1/buildconfigs/mk.linux-2.6-xen0
--- 2/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@@ -25,22 -25,18 +25,22 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
            ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
-       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
-         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
 -        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 +        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
  
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +
  clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
  

diff --cc buildconfigs/mk.linux-2.6-xenU
index b83244efd0f03656490810e9a556d4c7a51a7979,dd979745c045a4a26e0f138e56636fed1257d22f..9292b782320486ad4efccb36ed1b00c8684e2bd3
--- 1/buildconfigs/mk.linux-2.6-xenU
--- 2/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@@ -25,22 -25,18 +25,22 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
            ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
-       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
-         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
 -        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 +        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
  
 +config: CONFIGMODE = menuconfig
 +config: $(LINUX_DIR)/include/linux/autoconf.h
 +      $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
 +
  clean::
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean